diff --git a/common/me.nix b/common/me.nix index 8a3a0e6..cb76476 100644 --- a/common/me.nix +++ b/common/me.nix @@ -1,5 +1,5 @@ -{ pkgs, workDir, confDir, secretsDir, ... }: +{ pkgs, workDir, confDir, secretsDir, inputs, ... }: { imports = [ @@ -8,7 +8,7 @@ ./programms/alacritty.nix ./programms/bash.nix ./programms/emacs.nix - ./programms/rofi.nix + ./programms/rofi/default.nix ./programms/zathura.nix ./programms/ssh.nix ./programms/neovim.nix @@ -39,6 +39,7 @@ home.file = { ".config/rclone".source = config.lib.file.mkOutOfStoreSymlink "${secretsDir}/rclone-conf"; + ".xmobarrc".source = "${confDir}/misc/xmobar.hs"; }; }; @@ -103,6 +104,8 @@ lolcat android-tools + inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin + # python.... (python310.withPackages (p: with p; [ pandas @@ -132,7 +135,8 @@ # xmonad services.xserver.windowManager.xmonad = { enable = true; - config = builtins.readFile ../misc/xmobar.hs; + config = ../misc/xmonad.hs; + #config = "${confDir}/misc/xmo"; enableContribAndExtras = true; extraPackages = hpkgs: [ hpkgs.xmobar diff --git a/common/programms/alacritty.nix b/common/programms/alacritty.nix index b11bb4f..544bfc3 100644 --- a/common/programms/alacritty.nix +++ b/common/programms/alacritty.nix @@ -1,6 +1,6 @@ { ... }: { - home-manager.users.me.programms.alacritty = { + home-manager.users.me.programs.alacritty = { enable = true; settings = { font = { @@ -100,9 +100,9 @@ { key = "V"; mods = "Control|Shift"; action = "Paste"; } { key = "C"; mods = "Control|Shift"; action = "Copy"; } { key = "J"; mods = "Control"; chars = ''\x1b\x5b\x42''; } - { key = "K"; mods = "Control"; chars = ''x1b\x5b\x41''; } - { key = "H"; mods = "Control"; chars = ''x1b\x5b\x44''; } - { key = "L"; mods = "Control"; chars = ''x1b\x5b\x43''; } + { key = "K"; mods = "Control"; chars = ''\x1b\x5b\x41''; } + { key = "H"; mods = "Control"; chars = ''\x1b\x5b\x44''; } + { key = "L"; mods = "Control"; chars = ''\x1b\x5b\x43''; } ]; }; }; diff --git a/common/programms/bash.nix b/common/programms/bash.nix index f1e7034..0e30ff4 100644 --- a/common/programms/bash.nix +++ b/common/programms/bash.nix @@ -7,7 +7,7 @@ historyFile = "${persistentDir}/bash-history"; historyFileSize = 100000; - historyControl = "ignoredups"; + historyControl = [ "ignoredups" ]; historyIgnore = [ "ls" "cd" @@ -28,17 +28,23 @@ ]; sessionVariables = { + # this does not work aparently.... + # is needed to that ssh works TREM = "xterm"; # my prompt PS1 = ''\[\033[01;34m\]\W\[\033[00m\]\[\033[01;32m\]\[\033[00m\] ❯❯❯ ''; + + TEST = "hiiiiiiiiiiiiiiiiiiiiiiiiiii"; + + HIII = "hiiiiiiiiiiiiiiiiiiiiii"; }; shellAliases = { shutdown = "echo try harder.... xD"; npw = "nmcli c up pw"; - nixre = "sd nixos-rebuild switch --flake ~/work/config/nix --impure"; + nixre = "sd nixos-rebuild switch --flake ~/work/config/ --impure"; flex = "neofetch | lolcat"; kwoche = "curl https://kalenderwoche.celll.net/?api=1; echo"; psg = "ps -e | grep"; @@ -62,6 +68,12 @@ }; bashrcExtra = '' + export TREM="xterm" + + # my prompt + export PS1="\[\033[01;34m\]\W\[\033[00m\]\[\033[01;32m\]\[\033[00m\] ❯❯❯ " + + # If not running interactively, don't do anything case $- in *i*) ;; diff --git a/common/programms/emacs.nix b/common/programms/emacs.nix index d7a8fee..b78a746 100644 --- a/common/programms/emacs.nix +++ b/common/programms/emacs.nix @@ -1,6 +1,6 @@ { inputs, ... }: { - home-manager.users.me.programms.emcas = { - enable = true; - }; + #home-manager.users.me.programs.emcas = { + #enable = true; + #}; } diff --git a/common/programms/git.nix b/common/programms/git.nix index 5c9b057..43aa506 100644 --- a/common/programms/git.nix +++ b/common/programms/git.nix @@ -1,11 +1,11 @@ { ... }: { - home-manager.users.me.programms.git = { + home-manager.users.me.programs.git = { enable = true; userName = "Sebastian Moser"; - userEmail = "sewi.moser@gmail.com"; + userEmail = "me@c2vi.dev"; extraConfig.core.editor = "nvim"; - extraConfig.core.excludesfile = "gitignore"; + extraConfig.core.excludesfile = "~/.config/git/gitignore"; }; } diff --git a/common/programms/lf/default.nix b/common/programms/lf/default.nix index 497c259..4070c1c 100644 --- a/common/programms/lf/default.nix +++ b/common/programms/lf/default.nix @@ -3,7 +3,7 @@ home-manager.users.me.programs.lf = { package = pkgs.lf.overrideAttrs (final: prev: { patches = (prev.patches or [ ]) ++ [ - lib/patches/lf-filter.patch + ./lf-filter.patch ]; checkPhase = ""; }); @@ -34,5 +34,5 @@ ee = "editor-open"; V = ''$${pkgs.bat}/bin/bat --paging=always --theme=gruvbox "$f"''; }; - + }; } diff --git a/common/programms/neovim.nix b/common/programms/neovim.nix index c46e55b..c86d4f9 100644 --- a/common/programms/neovim.nix +++ b/common/programms/neovim.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - home-manager.users.me.programms.neovim = { + home-manager.users.me.programs.neovim = { enable = true; withPython3 = true; withNodeJs = true; diff --git a/common/programms/rofi.nix b/common/programms/rofi.nix deleted file mode 100644 index 06029cc..0000000 --- a/common/programms/rofi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ ... }: -{ - home-manager.users.me.programs.rofi = { - enable = true; - theme = "Ark-Dark by leofa"; - extraConfig = '' - modi: "run,filebrowser"; - color-normal: "#1c2023, #919ba0, #1c2023, #a4a4a4, #1c2023"; - color-urgent: "argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49"; - color-active: "argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49"; - color-window: "#1c2023, #919ba0, #1c2023"; - ''; - }; -} diff --git a/common/programms/rofi/default.nix b/common/programms/rofi/default.nix new file mode 100644 index 0000000..9959b43 --- /dev/null +++ b/common/programms/rofi/default.nix @@ -0,0 +1,14 @@ +{ ... }: +{ + home-manager.users.me.programs.rofi = { + enable = true; + theme = "Arc-Dark"; + extraConfig = { + modi = "run,filebrowser"; + color-normal = "#1c2023, #919ba0, #1c2023, #a4a4a4, #1c2023"; + color-urgent = "argb:00000000, #f43753, argb:00000000, argb:00000000, #e29a49"; + color-active = "argb:00000000, #49bbfb, argb:00000000, argb:00000000, #e29a49"; + color-window = "#1c2023, #919ba0, #1c2023"; + }; + }; +} diff --git a/common/programms/ssh.nix b/common/programms/ssh.nix index d735a8f..d1c0958 100644 --- a/common/programms/ssh.nix +++ b/common/programms/ssh.nix @@ -1,12 +1,13 @@ { secretsDir, ... }: { - home-manager.users.me.programms.ssh = { + home-manager.users.me.programs.ssh = { enable = true; includes = [ "./current_rpi_config" ]; + /* matchBlocks = { hpm = { hostame = "192.168.1.56"; - use = "root"; + user = "root"; }; servers = { @@ -39,9 +40,10 @@ identityFIle = "${secretsDir}/private-key-ocib"; }; }; + */ }; - home-manager.users.me.home.".ssh/rpi/local".text = '' + home-manager.users.me.home.file.".ssh/rpi/local".text = '' Host config HostName 192.168.1.2 User config @@ -76,7 +78,7 @@ IdentityFile ${secretsDir}/private-key-main ''; - home-manager.users.me.home.".ssh/rpi/remote".text = '' + home-manager.users.me.home.file.".ssh/rpi/remote".text = '' Host config HostName sebastian.dns.army User config @@ -111,7 +113,7 @@ IdentityFile ${secretsDir}/private-key-main ''; - home-manager.users.me.home.".ssh/rpi/wstunnel".text = '' + home-manager.users.me.home.file.".ssh/rpi/wstunnel".text = '' Host config HostName localhost User config diff --git a/common/programms/zathura.nix b/common/programms/zathura.nix index 26d291f..26a4800 100644 --- a/common/programms/zathura.nix +++ b/common/programms/zathura.nix @@ -1,6 +1,6 @@ { ... }: { - home-manager.users.me.programms.zathura = { + home-manager.users.me.programs.zathura = { enable = true; options = { selection-clipboard = "clipboard"; diff --git a/flake.lock b/flake.lock index bdb091c..a297001 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,152 @@ "type": "github" } }, + "doom-emacs": { + "flake": false, + "locked": { + "lastModified": 1662497747, + "narHash": "sha256-4n7E1fqda7cn5/F2jTkOnKw1juG6XMS/FI9gqODL3aU=", + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "doomemacs", + "rev": "3853dff5e11655e858d0bfae64b70cb12ef685ac", + "type": "github" + } + }, + "doom-snippets": { + "flake": false, + "locked": { + "lastModified": 1694887483, + "narHash": "sha256-KlKhruPSLPSKqUnr5/U65arm16VrY9ORzm+XKNZhpTQ=", + "owner": "doomemacs", + "repo": "snippets", + "rev": "f022984ee1318a4015d5d081b3c3dab5a60dc6ff", + "type": "github" + }, + "original": { + "owner": "doomemacs", + "repo": "snippets", + "type": "github" + } + }, + "emacs-overlay": { + "flake": false, + "locked": { + "lastModified": 1676366521, + "narHash": "sha256-i4UAY8t9Au9SJtsgYppa3NHSVf1YkV6yqnNIQd+Km4g=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "c16be6de78ea878aedd0292aa5d4a1ee0a5da501", + "type": "github" + } + }, + "emacs-so-long": { + "flake": false, + "locked": { + "lastModified": 1575031854, + "narHash": "sha256-xIa5zO0ZaToDrec1OFjBK6l39AbA4l/CE4LInVu2hi0=", + "owner": "hlissner", + "repo": "emacs-so-long", + "rev": "ed666b0716f60e8988c455804de24b55919e71ca", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "emacs-so-long", + "type": "github" + } + }, + "evil-escape": { + "flake": false, + "locked": { + "lastModified": 1588439096, + "narHash": "sha256-aB2Ge5o/93B18tPf4fN1c+O46CNh/nOqwLJbox4c8Gw=", + "owner": "hlissner", + "repo": "evil-escape", + "rev": "819f1ee1cf3f69a1ae920e6004f2c0baeebbe077", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-escape", + "type": "github" + } + }, + "evil-markdown": { + "flake": false, + "locked": { + "lastModified": 1626852210, + "narHash": "sha256-HBBuZ1VWIn6kwK5CtGIvHM1+9eiNiKPH0GUsyvpUVN8=", + "owner": "Somelauw", + "repo": "evil-markdown", + "rev": "8e6cc68af83914b2fa9fd3a3b8472573dbcef477", + "type": "github" + }, + "original": { + "owner": "Somelauw", + "repo": "evil-markdown", + "type": "github" + } + }, + "evil-org-mode": { + "flake": false, + "locked": { + "lastModified": 1607203864, + "narHash": "sha256-JxwqVYDN6OIJEH15MVI6XOZAPtUWUhJQWHyzcrUvrFg=", + "owner": "hlissner", + "repo": "evil-org-mode", + "rev": "a9706da260c45b98601bcd72b1d2c0a24a017700", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "evil-org-mode", + "type": "github" + } + }, + "evil-quick-diff": { + "flake": false, + "locked": { + "lastModified": 1575189609, + "narHash": "sha256-oGzl1ayW9rIuq0haoiFS7RZsS8NFMdEA7K1BSozgnJU=", + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "rev": "69c883720b30a892c63bc89f49d4f0e8b8028908", + "type": "github" + }, + "original": { + "owner": "rgrinberg", + "repo": "evil-quick-diff", + "type": "github" + } + }, + "explain-pause-mode": { + "flake": false, + "locked": { + "lastModified": 1595842060, + "narHash": "sha256-++znrjiDSx+cy4okFBBXUBkRFdtnE2x+trkmqjB3Njs=", + "owner": "lastquestion", + "repo": "explain-pause-mode", + "rev": "2356c8c3639cbeeb9751744dbe737267849b4b51", + "type": "github" + }, + "original": { + "owner": "lastquestion", + "repo": "explain-pause-mode", + "type": "github" + } + }, "firefox": { "inputs": { "cachix": "cachix", @@ -53,6 +199,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -71,6 +233,41 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "format-all": { + "flake": false, + "locked": { + "lastModified": 1581716637, + "narHash": "sha256-ul7LCe60W8TIvUmUtZtZRo8489TK9iTPDsLHmzxY57M=", + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + }, + "original": { + "owner": "lassik", + "repo": "emacs-format-all-the-code", + "rev": "47d862d40a088ca089c92cd393c6dca4628f87d3", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -127,6 +324,64 @@ "type": "github" } }, + "nix-doom-emacs": { + "inputs": { + "doom-emacs": "doom-emacs", + "doom-snippets": "doom-snippets", + "emacs-overlay": "emacs-overlay", + "emacs-so-long": "emacs-so-long", + "evil-escape": "evil-escape", + "evil-markdown": "evil-markdown", + "evil-org-mode": "evil-org-mode", + "evil-quick-diff": "evil-quick-diff", + "explain-pause-mode": "explain-pause-mode", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "format-all": "format-all", + "nix-straight": "nix-straight", + "nixpkgs": "nixpkgs_2", + "nose": "nose", + "ob-racket": "ob-racket", + "org": "org", + "org-contrib": "org-contrib", + "org-yt": "org-yt", + "php-extras": "php-extras", + "revealjs": "revealjs", + "rotate-text": "rotate-text", + "sln-mode": "sln-mode", + "ts-fold": "ts-fold", + "ws-butler": "ws-butler" + }, + "locked": { + "lastModified": 1697814738, + "narHash": "sha256-mwQmykamvRuHmO6I2VTm8+TOIhhmgy2g5YrMjoCHawY=", + "owner": "nix-community", + "repo": "nix-doom-emacs", + "rev": "c1c99cf41694440d76e31126dc394f52faeb691e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-doom-emacs", + "type": "github" + } + }, + "nix-straight": { + "flake": false, + "locked": { + "lastModified": 1694361489, + "narHash": "sha256-kjDp+j6OtrmqbtjQB5uuOtjS08+kgJQuxFqhWE1Y9Rw=", + "owner": "nix-community", + "repo": "nix-straight.el", + "rev": "748be99b84be0b130e946288099806a0f16d6e57", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-straight.el", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1697723726, @@ -159,6 +414,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1695806987, + "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixpkgs-unstable", + "type": "indirect" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1698060352, "narHash": "sha256-c7Thcf2xYTmB4uJpPdb07sPQOIVJWuyjjOfhE4RKq28=", @@ -174,11 +444,156 @@ "type": "github" } }, + "nose": { + "flake": false, + "locked": { + "lastModified": 1400604510, + "narHash": "sha256-daEi8Kta1oGaDEmUUDDQMahTTPOpvNpDKk22rlr7cB0=", + "owner": "emacsattic", + "repo": "nose", + "rev": "f8528297519eba911696c4e68fa88892de9a7b72", + "type": "github" + }, + "original": { + "owner": "emacsattic", + "repo": "nose", + "type": "github" + } + }, + "ob-racket": { + "flake": false, + "locked": { + "lastModified": 1584656173, + "narHash": "sha256-rBUYDDCXb+3D4xTPQo9UocbTPZ32kWV1Uya/1DmZknU=", + "owner": "xchrishawk", + "repo": "ob-racket", + "rev": "83457ec9e1e96a29fd2086ed19432b9d75787673", + "type": "github" + }, + "original": { + "owner": "xchrishawk", + "repo": "ob-racket", + "type": "github" + } + }, + "org": { + "flake": false, + "locked": { + "lastModified": 1695726851, + "narHash": "sha256-qgbjspklSoI8M3cbCJOcUdjuijRgsL/+PSyEOW9VX4I=", + "owner": "emacs-straight", + "repo": "org-mode", + "rev": "aa9177e1a8b039c357d369c1c9aaab710bb247a9", + "type": "github" + }, + "original": { + "owner": "emacs-straight", + "repo": "org-mode", + "type": "github" + } + }, + "org-contrib": { + "flake": false, + "locked": { + "lastModified": 1694946041, + "narHash": "sha256-X/HFG6NZe5BY00KvGbcsIuf9R6Lg8x7Uhd0Y5+Q3qZU=", + "owner": "emacsmirror", + "repo": "org-contrib", + "rev": "5eabbf22bdd4523c922a30787e98ee66c24221aa", + "type": "github" + }, + "original": { + "owner": "emacsmirror", + "repo": "org-contrib", + "type": "github" + } + }, + "org-yt": { + "flake": false, + "locked": { + "lastModified": 1527381913, + "narHash": "sha256-dzQ6B7ryzatHCTLyEnRSbWO0VUiX/FHYnpHTs74aVUs=", + "owner": "TobiasZawada", + "repo": "org-yt", + "rev": "40cc1ac76d741055cbefa13860d9f070a7ade001", + "type": "github" + }, + "original": { + "owner": "TobiasZawada", + "repo": "org-yt", + "type": "github" + } + }, + "php-extras": { + "flake": false, + "locked": { + "lastModified": 1573312690, + "narHash": "sha256-r4WyVbzvT0ra4Z6JywNBOw5RxOEYd6Qe2IpebHXkj1U=", + "owner": "arnested", + "repo": "php-extras", + "rev": "d410c5af663c30c01d461ac476d1cbfbacb49367", + "type": "github" + }, + "original": { + "owner": "arnested", + "repo": "php-extras", + "type": "github" + } + }, + "revealjs": { + "flake": false, + "locked": { + "lastModified": 1695738029, + "narHash": "sha256-Z9c9Q41jMkj/DyXOiZYyIa7Gmn8VB8yauTyWrSsT+ps=", + "owner": "hakimel", + "repo": "reveal.js", + "rev": "88fbfc5751ad01e3f6adee5819eabeb9e73c3757", + "type": "github" + }, + "original": { + "owner": "hakimel", + "repo": "reveal.js", + "type": "github" + } + }, "root": { "inputs": { "firefox": "firefox", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2" + "nix-doom-emacs": "nix-doom-emacs", + "nixpkgs": "nixpkgs_3" + } + }, + "rotate-text": { + "flake": false, + "locked": { + "lastModified": 1322962747, + "narHash": "sha256-SOeOgSlcEIsKhUiYDJv0p+mLUb420s9E2BmvZQvZ0wk=", + "owner": "debug-ito", + "repo": "rotate-text.el", + "rev": "48f193697db996855aee1ad2bc99b38c6646fe76", + "type": "github" + }, + "original": { + "owner": "debug-ito", + "repo": "rotate-text.el", + "type": "github" + } + }, + "sln-mode": { + "flake": false, + "locked": { + "lastModified": 1423727528, + "narHash": "sha256-XqkqPyEJuTtFslOz1fpTf/Klbd/zA7IGpzpmum/MGao=", + "owner": "sensorflo", + "repo": "sln-mode", + "rev": "0f91d1b957c7d2a7bab9278ec57b54d57f1dbd9c", + "type": "github" + }, + "original": { + "owner": "sensorflo", + "repo": "sln-mode", + "type": "github" } }, "systems": { @@ -195,6 +610,53 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "ts-fold": { + "flake": false, + "locked": { + "lastModified": 1695278494, + "narHash": "sha256-O4NcUC1u08W8ZslqoA/i+iTaLotKwheURXQWBxLLMFc=", + "owner": "jcs-elpa", + "repo": "ts-fold", + "rev": "70b2c79ff4daa7351d4e2917b0343b9a18d4d4f2", + "type": "github" + }, + "original": { + "owner": "jcs-elpa", + "repo": "ts-fold", + "type": "github" + } + }, + "ws-butler": { + "flake": false, + "locked": { + "lastModified": 1634511126, + "narHash": "sha256-c0y0ZPtxxICPk+eaNbbQf6t+FRCliNY54CCz9QHQ8ZI=", + "owner": "hlissner", + "repo": "ws-butler", + "rev": "572a10c11b6cb88293de48acbb59a059d36f9ba5", + "type": "github" + }, + "original": { + "owner": "hlissner", + "repo": "ws-butler", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index a4e9a1c..160e596 100644 --- a/flake.nix +++ b/flake.nix @@ -14,19 +14,20 @@ nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; }; - outputs = let - confDir = "/home/me/work/config"; - workDir = "/home/me/work"; - secretsDir = "/home/me/.mysecrets"; - persistentDir = "/home/me/work/app-data"; - in - { self, nixpkgs, ... }@inputs: { + outputs = { self, nixpkgs, ... }@inputs: + let + confDir = "/home/me/work/config"; + workDir = "/home/me/work"; + secretsDir = "/home/me/.mysecrets"; + persistentDir = "/home/me/work/app-data"; + in + { nixosConfigurations = { "c2vi-main" = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = [ inputs confDir workDir ]; + specialArgs = { inherit inputs confDir workDir secretsDir persistentDir; }; modules = [ ./hosts/main.nix ]; diff --git a/hosts/main.nix b/hosts/main.nix index ce05dca..35e684d 100644 --- a/hosts/main.nix +++ b/hosts/main.nix @@ -1,5 +1,5 @@ -{ pkgs, lib, workDir, confDir, ... }: +{ pkgs, lib, workDir, confDir, inputs, ... }: { # https://bugzilla.kernel.org/show_bug.cgi?id=110941 @@ -14,6 +14,14 @@ ############################# BOOT ############################# # boot + imports = [ + ../mods/battery_monitor.nix + ../mods/my-nixpkgs-overlay.nix + ../hardware/my-hp-laptop.nix + ../common/me.nix + inputs.home-manager.nixosModules.home-manager + ]; + # Setup keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; @@ -115,6 +123,7 @@ services.samba = { nix.settings.experimental-features = [ "nix-command" "flakes" ]; + nixpkgs.config.allowUnfree = true; security.sudo.wheelNeedsPassword = false; virtualisation.libvirtd.enable = true; @@ -139,7 +148,8 @@ export PATH=$PATH:${confDir}/mybin enable = true; extraPortals = [ #pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-termfilechooser + #pkgs.xdg-desktop-portal-termfilechooser + (pkgs.callPackage ../mods/xdg-desktop-portal-termfilechooser/default.nix {}) ]; }; @@ -171,32 +181,32 @@ export PATH=$PATH:${confDir}/mybin services.xserver = { enable = true; displayManager = { - defaultSession = "none+xmonad"; - sessionCommands = '' - xmobar ${confDir}/xmonad/xmobar.hs & - - # aparently needed, so that xmonad works - sleep 2 && \ - ${pkgs.xorg.xmodmap}/bin/xmodmap \ - -e "clear control" \ - -e "clear mod1" \ - -e "keycode 64 = Control_L" \ - -e "keycode 37 = Alt_L" \ - -e "add control = Control_L" \ - -e "add mod1 = Alt_L" \ - & + defaultSession = "none+xmonad"; + sessionCommands = '' + xmobar ${confDir}/xmonad/xmobar.hs & + # aparently needed, so that xmonad works + sleep 2 && \ + ${pkgs.xorg.xmodmap}/bin/xmodmap \ + -e "clear control" \ + -e "clear mod1" \ + -e "keycode 64 = Control_L" \ + -e "keycode 37 = Alt_L" \ + -e "add control = Control_L" \ + -e "add mod1 = Alt_L" \ + & ''; }; displayManager.lightdm = { - greeters.enso = { - enable = true; - blur = true; - extraConfig = '' - default-wallpaper=/usr/share/streets_of_gruvbox.png - ''; - }; + enable = true; + greeters.enso = { + enable = true; + blur = true; + extraConfig = '' + default-wallpaper=/usr/share/streets_of_gruvbox.png + ''; + }; }; layout = "at"; }; diff --git a/mods/my-nixpkgs-overlay.nix b/mods/my-nixpkgs-overlay.nix index 1492e17..9dcd4b6 100644 --- a/mods/my-nixpkgs-overlay.nix +++ b/mods/my-nixpkgs-overlay.nix @@ -1,11 +1,11 @@ -{ pkgs, confDir, inputs, ... }: +{ pkgs, inputs, ... }: { nixpkgs.overlays = [ - { - localPacketTracer8 = (pkgs.callPackage ../../prebuilt/packetTracer/default.nix {confDir = confDir;}); - xdg-desktop-portal-termfilechooser = (pkgs.callPackage ../../mods/xdg-desktop-portal-termfilechooser/default.nix {}); - firefox = inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin; - } + #{ + #localPacketTracer8 = (pkgs.callPackage ../../prebuilt/packetTracer/default.nix {confDir = confDir;}); + #xdg-desktop-portal-termfilechooser = (pkgs.callPackage ../../mods/xdg-desktop-portal-termfilechooser/default.nix {}); + #firefox = inputs.firefox.packages.${pkgs.system}.firefox-nightly-bin; + #} ]; } diff --git a/scripts/nav/main.py b/scripts/nav/main.py index 3033f9d..920841b 100644 --- a/scripts/nav/main.py +++ b/scripts/nav/main.py @@ -12,7 +12,7 @@ def main(): db_matches = get_db_matches(pwd) folder_matches = get_folder_matches(pwd) - print(my_resolve("~/work/config/")) + print(my_resolve("~/work/config")) print("db:", db_matches) print("folder:", folder_matches)