Compare commits
1 commit
abf32ff426
...
8a0689c52e
| Author | SHA1 | Date | |
|---|---|---|---|
| 8a0689c52e |
14 changed files with 76 additions and 143 deletions
46
flake.lock
generated
46
flake.lock
generated
|
|
@ -122,11 +122,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743067111,
|
||||
"narHash": "sha256-v9VJXx7525gMH6S7WesJM84Dr76jxRubATuBJn4L14o=",
|
||||
"lastModified": 1742980632,
|
||||
"narHash": "sha256-UQRljs0DcUbfmVn90rUtpcuPbyGWHGmxob+WP36r9tg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "5c22a2387d4ac1e1d64d66489e7d3ecb0a30cbcd",
|
||||
"rev": "6a1714928534fd6e2c0c68f42507f05d9dba6820",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -387,11 +387,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743082807,
|
||||
"narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=",
|
||||
"lastModified": 1742996658,
|
||||
"narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "171915bfce41018528fda9960211e81946d999b7",
|
||||
"rev": "693840c01b9bef9e54100239cef937e53d4661bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -464,11 +464,11 @@
|
|||
"lix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1743065774,
|
||||
"narHash": "sha256-aC1lwnqwHbYRsPfx+lRi32fHRcln0xhIzf0Q7/Lg+vQ=",
|
||||
"lastModified": 1742994059,
|
||||
"narHash": "sha256-dqT4RrP2yReB0TZr1gQPqoYUS08evAWk1VtjMLuN5MM=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "b918f1c307b314daa44407bac60046630f13ed48",
|
||||
"revCount": 17742,
|
||||
"rev": "21dac7513cbb65173e825e04b14dadb99d3fc01a",
|
||||
"revCount": 17734,
|
||||
"type": "git",
|
||||
"url": "https://git@git.lix.systems/lix-project/lix"
|
||||
},
|
||||
|
|
@ -647,11 +647,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1742937945,
|
||||
"narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=",
|
||||
"lastModified": 1742751704,
|
||||
"narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7",
|
||||
"rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -695,11 +695,11 @@
|
|||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"lastModified": 1742669843,
|
||||
"narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"rev": "1e5b653dff12029333a6546c11e108ede13052eb",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -726,17 +726,17 @@
|
|||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"lastModified": 1736701207,
|
||||
"narHash": "sha256-jG/+MvjVY7SlTakzZ2fJ5dC3V1PrKKrUEOEE30jrOKA=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ed4a395ea001367c1f13d34b1e01aa10290f67d6",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
@ -992,11 +992,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743081648,
|
||||
"narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=",
|
||||
"lastModified": 1742982148,
|
||||
"narHash": "sha256-aRA6LSxjlbMI6MmMzi/M5WH/ynd8pK+vACD9za3MKLQ=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7",
|
||||
"rev": "61c88349bf6dff49fa52d7dfc39b21026c2a8881",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
inputs = {
|
||||
flakeParts.url = "github:hercules-ci/flake-parts";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/ed4a395ea001367c1f13d34b1e01aa10290f67d6"; # FIXME update (check if screen sharing works!)
|
||||
nixosHardware.url = "github:NixOS/nixos-hardware";
|
||||
homeManager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
|
|
|
|||
|
|
@ -548,13 +548,6 @@
|
|||
(eglot-ensure))))
|
||||
:mode "\\.ts\\'")
|
||||
|
||||
(use-package rust-mode
|
||||
:init
|
||||
(setq rust-mode-treesitter-derive t)
|
||||
:hook ((rust-mode . (lambda ()
|
||||
(require 'eglot)
|
||||
(eglot-ensure)))))
|
||||
|
||||
(use-package haskell-ts-mode
|
||||
:hook ((haskell--ts-mode . eglot-ensure))
|
||||
:mode "\\.hs\\'"
|
||||
|
|
@ -661,8 +654,7 @@
|
|||
(eat-eshell-mode)
|
||||
(eat-eshell-visual-command-mode)
|
||||
:custom ((eshell-prefer-lisp-functions t)
|
||||
(eshell-history-size 10000)
|
||||
(eshell-banner-message ""))
|
||||
(eshell-history-size 10000))
|
||||
:config
|
||||
(defun ccr/start-eshell () ;; Used from outside Emacs by emacsclient --eval
|
||||
(eshell 'N)
|
||||
|
|
@ -689,10 +681,8 @@
|
|||
ccr/eshell-aliases)
|
||||
|
||||
:bind (("C-c o e" . project-eshell)
|
||||
(:map eshell-mode-map
|
||||
("C-r" . eshell-atuin-history)
|
||||
("C-<return>" . corfu-send)
|
||||
))) ;; i.e. just C-r in semi-char-mode
|
||||
:map eshell-mode-map
|
||||
("C-r" . eshell-atuin-history))) ;; i.e. just C-r in semi-char-mode
|
||||
|
||||
(use-package eshell-command-not-found
|
||||
:custom ((eshell-command-not-found-command "command-not-found"))
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ in
|
|||
};
|
||||
profiles.default = {
|
||||
search.force = true;
|
||||
search.default = "google";
|
||||
search.default = "Google";
|
||||
search.engines = {
|
||||
"Searx" = {
|
||||
urls = [
|
||||
|
|
@ -79,6 +79,7 @@ in
|
|||
];
|
||||
};
|
||||
};
|
||||
bookmarks = [ ];
|
||||
extensions = [ ];
|
||||
userChrome = builtins.readFile ./userchrome.css;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ in
|
|||
};
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
plugins = with pkgs.hyprlandPlugins; [
|
||||
hy3
|
||||
hyprspace
|
||||
|
|
|
|||
|
|
@ -223,16 +223,16 @@ layout {
|
|||
// bottom 64
|
||||
}
|
||||
|
||||
shadow {
|
||||
on
|
||||
}
|
||||
// shadow {
|
||||
// on
|
||||
// }
|
||||
}
|
||||
|
||||
layer-rule {
|
||||
match namespace="^rofi$"
|
||||
shadow {
|
||||
on
|
||||
}
|
||||
// shadow {
|
||||
// on
|
||||
// }
|
||||
}
|
||||
|
||||
// Add lines like this to spawn processes at startup.
|
||||
|
|
|
|||
|
|
@ -70,53 +70,35 @@
|
|||
};
|
||||
};
|
||||
|
||||
programs.bash = {
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
initExtra = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
||||
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
||||
'';
|
||||
plugins = [
|
||||
# {
|
||||
# name = "fifc";
|
||||
# src = pkgs.fishPlugins.fifc.src;
|
||||
# }
|
||||
{
|
||||
name = "z";
|
||||
src = pkgs.fishPlugins.z.src;
|
||||
}
|
||||
];
|
||||
shellInit =
|
||||
''
|
||||
# fish_vi_key_bindings
|
||||
fish_default_key_bindings
|
||||
''
|
||||
+ lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
||||
export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
||||
'';
|
||||
shellAliases = {
|
||||
"cat" = "bat";
|
||||
};
|
||||
};
|
||||
|
||||
programs.zoxide.enable = true;
|
||||
programs.thefuck.enable = true;
|
||||
programs.oh-my-posh = {
|
||||
enable = true;
|
||||
useTheme = "catppuccin_mocha";
|
||||
};
|
||||
|
||||
programs.zellij.enableBashIntegration = false;
|
||||
|
||||
# programs.fish = {
|
||||
# enable = true;
|
||||
# plugins = [
|
||||
# # {
|
||||
# # name = "fifc";
|
||||
# # src = pkgs.fishPlugins.fifc.src;
|
||||
# # }
|
||||
# {
|
||||
# name = "z";
|
||||
# src = pkgs.fishPlugins.z.src;
|
||||
# }
|
||||
# ];
|
||||
# shellInit =
|
||||
# ''
|
||||
# # fish_vi_key_bindings
|
||||
# fish_default_key_bindings
|
||||
# ''
|
||||
# + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
|
||||
# export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
|
||||
# '';
|
||||
# shellAliases = {
|
||||
# "cat" = "bat";
|
||||
# };
|
||||
# };
|
||||
|
||||
home.packages =
|
||||
with pkgs;
|
||||
[
|
||||
thefuck
|
||||
dig.dnsutils
|
||||
lsof
|
||||
comma
|
||||
|
|
|
|||
|
|
@ -28,29 +28,6 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
portal = {
|
||||
enable = true;
|
||||
configPackages = with pkgs; [
|
||||
# xdg-desktop-portal-wlr
|
||||
# xdg-desktop-portal-gtk
|
||||
# xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-gnome
|
||||
# xdg-desktop-portal
|
||||
# kdePackages.xdg-desktop-portal-kde
|
||||
# libsForQt5.xdg-desktop-portal-kde
|
||||
gnome-keyring
|
||||
];
|
||||
extraPortals = with pkgs; [
|
||||
# xdg-desktop-portal-wlr
|
||||
# xdg-desktop-portal-gtk
|
||||
# xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-gnome
|
||||
# xdg-desktop-portal
|
||||
# kdePackages.xdg-desktop-portal-kde
|
||||
gnome-keyring
|
||||
];
|
||||
};
|
||||
|
||||
};
|
||||
home.packages = [ pkgs.xdg-utils ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,6 +99,7 @@ in
|
|||
{
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
enableFishIntegration = false;
|
||||
settings = {
|
||||
default_layout = "${layout}";
|
||||
pane_frames = false;
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@
|
|||
"tor-browser"
|
||||
"kicad"
|
||||
"monero"
|
||||
# "zulip"
|
||||
"zulip"
|
||||
"teams"
|
||||
"obs-studio"
|
||||
"calibre"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ lib, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
services.radarr = {
|
||||
enable = true;
|
||||
|
|
@ -6,6 +6,9 @@
|
|||
|
||||
services.sonarr = {
|
||||
enable = true;
|
||||
package =
|
||||
(builtins.getFlake "github:NixOS/nixpkgs/c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5")
|
||||
.legacyPackages.${pkgs.stdenv.system}.sonarr;
|
||||
};
|
||||
|
||||
services.prowlarr = {
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ in
|
|||
|
||||
shell = lib.mkOption {
|
||||
type = lib.types.package;
|
||||
default = pkgs.bash;
|
||||
default = pkgs.fish;
|
||||
};
|
||||
|
||||
modules = lib.mkOption {
|
||||
|
|
@ -103,6 +103,8 @@ in
|
|||
openssh.authorizedKeys.keys = config.ccr.authorizedKeys;
|
||||
};
|
||||
|
||||
programs.fish.enable = true;
|
||||
|
||||
services.getty.autologinUser = if config.ccr.autologin then cfg.username else null;
|
||||
|
||||
home-manager.useGlobalPkgs = true;
|
||||
|
|
|
|||
|
|
@ -1,51 +1,29 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
xdg = {
|
||||
autostart.enable = true;
|
||||
menus.enable = true;
|
||||
mime.enable = true;
|
||||
icons.enable = true;
|
||||
portal = {
|
||||
enable = true;
|
||||
configPackages = with pkgs; [
|
||||
# xdg-desktop-portal-wlr
|
||||
# xdg-desktop-portal-gtk
|
||||
# xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-wlr
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-gnome
|
||||
# xdg-desktop-portal
|
||||
# kdePackages.xdg-desktop-portal-kde
|
||||
# libsForQt5.xdg-desktop-portal-kde
|
||||
xdg-desktop-portal
|
||||
kdePackages.xdg-desktop-portal-kde
|
||||
libsForQt5.xdg-desktop-portal-kde
|
||||
gnome-keyring
|
||||
];
|
||||
extraPortals = with pkgs; [
|
||||
# xdg-desktop-portal-wlr
|
||||
# xdg-desktop-portal-gtk
|
||||
# xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-wlr
|
||||
xdg-desktop-portal-gtk
|
||||
xdg-desktop-portal-hyprland
|
||||
xdg-desktop-portal-gnome
|
||||
# xdg-desktop-portal
|
||||
# kdePackages.xdg-desktop-portal-kde
|
||||
xdg-desktop-portal
|
||||
kdePackages.xdg-desktop-portal-kde
|
||||
gnome-keyring
|
||||
];
|
||||
xdgOpenUsePortal = true;
|
||||
wlr.enable = true;
|
||||
};
|
||||
|
||||
};
|
||||
security.rtkit.enable = true;
|
||||
|
||||
security.polkit.enable = true;
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
systemd.user.services.niri-flake-polkit = {
|
||||
description = "PolicyKit Authentication Agent provided by niri-flake";
|
||||
wantedBy = [ "niri.service" ];
|
||||
after = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
serviceConfig = {
|
||||
Type = "simple";
|
||||
ExecStart = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 1;
|
||||
TimeoutStopSec = 10;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -182,7 +182,6 @@ let
|
|||
markdown-mode
|
||||
haskell-mode
|
||||
terraform-mode
|
||||
rust-mode
|
||||
diredfl
|
||||
org-modern
|
||||
math-preview
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue