From e9587b46b2d03b966a25abc90baad2abb74b4c6c Mon Sep 17 00:00:00 2001 From: Madeleine Date: Sat, 7 Oct 2023 10:30:12 +0100 Subject: [PATCH] new applications & fixes for nixos --- flake.lock | 18 +++++++++--------- maddie/common/{exa.nix => esa.nix} | 2 +- maddie/common/python.nix | 1 + maddie/common/shell.nix | 2 +- maddie/nixos/dmenu/dmenu-code | 0 maddie/nixos/dmenu/dmenu-man | 0 maddie/nixos/jetbrains.nix | 1 + maddie/nixos/kdeconnect.nix | 2 +- maddie/nixos/openrgb.nix | 2 +- maddie/nixos/picom.nix | 2 +- maddie/nixos/secrets.nix | 2 +- maddie/nixos/slstatus.nix | 2 +- maddie/nixos/syncplay.nix | 2 +- maddie/nixos/uxplay.nix | 7 +++++++ maddie/nixos/xorg.nix | 4 ++-- systems/mdesktop/boot.nix | 8 ++------ systems/mdesktop/fonts.nix | 1 + systems/mdesktop/locale.nix | 4 ++-- systems/mdesktop/nvidia.nix | 2 +- systems/mdesktop/plymouth/logo.png | Bin 27034 -> 0 bytes systems/mdesktop/xorg.nix | 10 +--------- systems/mmacbookpro/apps.nix | 1 + 22 files changed, 36 insertions(+), 37 deletions(-) rename maddie/common/{exa.nix => esa.nix} (91%) mode change 100644 => 100755 maddie/nixos/dmenu/dmenu-code mode change 100644 => 100755 maddie/nixos/dmenu/dmenu-man create mode 100644 maddie/nixos/uxplay.nix delete mode 100644 systems/mdesktop/plymouth/logo.png diff --git a/flake.lock b/flake.lock index d25db20..c8a8709 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1692248770, - "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=", + "lastModified": 1696360011, + "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b", + "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "type": "github" }, "original": { @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1692763155, - "narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=", + "lastModified": 1696409884, + "narHash": "sha256-hz3i4wFJHoTIAEI19oF1fiPn6TpV+VuTSOrSHUoJMgs=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a20e40acaebf067da682661aa67da8b36812606", + "rev": "8aef005d44ee726911e9f793495bb40f2fbf5a05", "type": "github" }, "original": { @@ -42,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693028636, - "narHash": "sha256-WOG42JO/yyvgYK3jQktDEy2qtZI7R+s3Lo4Y9gBr6XM=", + "lastModified": 1696385948, + "narHash": "sha256-GSUIyYROcOExkGt3hDPDPeu/7ska2StMCL0voxMK/ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e61ea96d43505ba0d2c066134eb9d67cadfddce7", + "rev": "d1c9180c6d1f8fce9469436f48c1cb8180d7087d", "type": "github" }, "original": { diff --git a/maddie/common/exa.nix b/maddie/common/esa.nix similarity index 91% rename from maddie/common/exa.nix rename to maddie/common/esa.nix index 270d574..7d4167b 100644 --- a/maddie/common/exa.nix +++ b/maddie/common/esa.nix @@ -1,7 +1,7 @@ { config, ... }: { - programs.exa = { + programs.eza = { enable = true; enableAliases = true; extraOptions = [ diff --git a/maddie/common/python.nix b/maddie/common/python.nix index cb254d7..7024e6d 100644 --- a/maddie/common/python.nix +++ b/maddie/common/python.nix @@ -13,6 +13,7 @@ let argon2_cffi python-dotenv python-lsp-server + openrgb-python ]; in { diff --git a/maddie/common/shell.nix b/maddie/common/shell.nix index d132eaa..535e3af 100644 --- a/maddie/common/shell.nix +++ b/maddie/common/shell.nix @@ -27,7 +27,7 @@ unfuck-wifi = "doas systemctl restart wpa_supplicant.service"; search = "f=$(fzf) && cd \"$f\" 2>/dev/null || xdg-open \"$f\" >/dev/null 2>&1"; cdt = "cd $(mktemp -d)"; - sx = "startx ~/.config/x11/xinitrc"; + sx = "startx ~/.xprofile"; sdn = "doas shutdown -h now"; kys = "kill $(pidof '$@')"; diff --git a/maddie/nixos/dmenu/dmenu-code b/maddie/nixos/dmenu/dmenu-code old mode 100644 new mode 100755 diff --git a/maddie/nixos/dmenu/dmenu-man b/maddie/nixos/dmenu/dmenu-man old mode 100644 new mode 100755 diff --git a/maddie/nixos/jetbrains.nix b/maddie/nixos/jetbrains.nix index 51b934f..00ba844 100644 --- a/maddie/nixos/jetbrains.nix +++ b/maddie/nixos/jetbrains.nix @@ -6,6 +6,7 @@ jetbrains.goland jetbrains.webstorm jetbrains.datagrip + jetbrains.rust-rover jetbrains.pycharm-professional ]; } diff --git a/maddie/nixos/kdeconnect.nix b/maddie/nixos/kdeconnect.nix index 2b2df12..32be6dc 100644 --- a/maddie/nixos/kdeconnect.nix +++ b/maddie/nixos/kdeconnect.nix @@ -3,7 +3,7 @@ { services.kdeconnect.enable = true; - home.file.".xinitrc".text = '' + home.file.".xprofile".text = '' # Start kdeconnect when entering a graphical session systemctl restart --user kdeconnect.service & ''; diff --git a/maddie/nixos/openrgb.nix b/maddie/nixos/openrgb.nix index ffaa72f..b783e0d 100644 --- a/maddie/nixos/openrgb.nix +++ b/maddie/nixos/openrgb.nix @@ -5,7 +5,7 @@ openrgb-with-all-plugins ]; - home.file.".xinitrc".text = '' + home.file.".xprofile".text = '' # Set RGB perhipherals to white ${pkgs.openrgb}/bin/openrgb -c white -m static & diff --git a/maddie/nixos/picom.nix b/maddie/nixos/picom.nix index eb5f048..7f99365 100644 --- a/maddie/nixos/picom.nix +++ b/maddie/nixos/picom.nix @@ -1,7 +1,7 @@ { config, pkgs, ... }: { - home.file.".xinitrc".text = '' + home.file.".xprofile".text = '' # Import xorg environment into systemd for the picom service to work systemctl --user import-environment XAUTHORITY DISPLAY & diff --git a/maddie/nixos/secrets.nix b/maddie/nixos/secrets.nix index d83450d..fced800 100644 --- a/maddie/nixos/secrets.nix +++ b/maddie/nixos/secrets.nix @@ -6,7 +6,7 @@ storePath = "${config.xdg.dataHome}/password-store"; }; - home.file.".xinitrc".text = '' + home.file.".xprofile".text = '' # Restart pass-secret-service as it tends to start failed systemctl restart --user pass-secret-service.service & ''; diff --git a/maddie/nixos/slstatus.nix b/maddie/nixos/slstatus.nix index e990e5a..a5e9af4 100644 --- a/maddie/nixos/slstatus.nix +++ b/maddie/nixos/slstatus.nix @@ -5,7 +5,7 @@ slstatus ]; - home.file.".xinitrc".text = '' + home.file.".xprofile".text = '' # Start slstatus ${pkgs.slstatus}/bin/slstatus & ''; diff --git a/maddie/nixos/syncplay.nix b/maddie/nixos/syncplay.nix index 4ee5032..9d89535 100644 --- a/maddie/nixos/syncplay.nix +++ b/maddie/nixos/syncplay.nix @@ -2,6 +2,6 @@ { home.packages = with pkgs; [ - syncplay + #syncplay ]; } diff --git a/maddie/nixos/uxplay.nix b/maddie/nixos/uxplay.nix new file mode 100644 index 0000000..4c7e6f9 --- /dev/null +++ b/maddie/nixos/uxplay.nix @@ -0,0 +1,7 @@ +{ config, pkgs, ... }: + +{ + home.packages = with pkgs; [ + uxplay + ]; +} diff --git a/maddie/nixos/xorg.nix b/maddie/nixos/xorg.nix index 74a62bd..2fb6324 100644 --- a/maddie/nixos/xorg.nix +++ b/maddie/nixos/xorg.nix @@ -43,9 +43,9 @@ "*.font" = "Iosevka:pixelsize=12:antialias=true:autohint=true"; }; - # Configure ~/.xinitrc + # Configure ~/.xprofile programs.feh.enable = true; - home.file.".xinitrc".text = '' + home.file.".xprofile".text = '' # Monitor configuration ${pkgs.xorg.xrandr}/bin/xrandr --output HDMI-0 --noprimary --mode 2560x1440 --pos 2560x0 --rotate right ${pkgs.xorg.xrandr}/bin/xrandr --output DP-0 --primary --mode 2560x1440 --pos 0x560 diff --git a/systems/mdesktop/boot.nix b/systems/mdesktop/boot.nix index 9ccad04..96a141a 100644 --- a/systems/mdesktop/boot.nix +++ b/systems/mdesktop/boot.nix @@ -15,12 +15,6 @@ boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.initrd.systemd.enable = true; - # Plymouth - boot.plymouth = { - enable = true; - #logo = ./plymouth/logo.png; - }; - # Setup crypto keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; @@ -31,9 +25,11 @@ boot.initrd.luks.devices."luks-16dda63d-9dce-4ef2-9da6-ee458ba3c44c".device = "/dev/disk/by-uuid/16dda63d-9dce-4ef2-9da6-ee458ba3c44c"; boot.initrd.luks.devices."luks-c180a121-376a-432e-a661-f4be3cc23dfa".keyFile = "/crypto_keyfile.bin"; + # Kernel settings boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; + boot.kernelParams = [ "video=2560x1440@180" ]; boot.extraModulePackages = [ ]; # Use the linux-zen kernel diff --git a/systems/mdesktop/fonts.nix b/systems/mdesktop/fonts.nix index 4c18ac6..e1b02f6 100644 --- a/systems/mdesktop/fonts.nix +++ b/systems/mdesktop/fonts.nix @@ -8,5 +8,6 @@ source-han-sans source-han-serif source-han-code-jp + terminus_font ]; } diff --git a/systems/mdesktop/locale.nix b/systems/mdesktop/locale.nix index 1c7fd22..0b0581e 100644 --- a/systems/mdesktop/locale.nix +++ b/systems/mdesktop/locale.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, pkgs, ... }: { # Time zone @@ -7,7 +7,7 @@ # Internationalisation properties i18n.defaultLocale = "en_GB.UTF-8"; console = { - font = "Lat2-Terminus16"; + font = "${pkgs.terminus_font}/share/consolefonts/ter-v12n.psf.gz"; keyMap = "uk"; }; } diff --git a/systems/mdesktop/nvidia.nix b/systems/mdesktop/nvidia.nix index 5aa7362..ebde31b 100644 --- a/systems/mdesktop/nvidia.nix +++ b/systems/mdesktop/nvidia.nix @@ -6,7 +6,7 @@ hardware.opengl.driSupport32Bit = true; hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; hardware.nvidia.open = false; - hardware.nvidia.modesetting.enable = true; + hardware.nvidia.modesetting.enable = false; services.xserver.videoDrivers = [ "nvidia" ]; hardware.opengl.extraPackages = [ diff --git a/systems/mdesktop/plymouth/logo.png b/systems/mdesktop/plymouth/logo.png deleted file mode 100644 index 8ddb01596bc5cddc6329f26eaa70401a72457839..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27034 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 diff --git a/systems/mdesktop/xorg.nix b/systems/mdesktop/xorg.nix index ccaface..186640b 100644 --- a/systems/mdesktop/xorg.nix +++ b/systems/mdesktop/xorg.nix @@ -5,21 +5,13 @@ # Enable X11 windowing system enable = true; - # Set gb X11 keymap + # Set X11 keymap as GB layout = "gb"; xkbOptions = "eurosign:e"; displayManager = { # Use startx for starting window managers startx.enable = true; - - # Use sddm for starting KDE - # sddm.enable = true; }; - - # Enable KDE Plasma 5 - /* desktopManager = { - plasma5.enable = true; - }; */ }; } diff --git a/systems/mmacbookpro/apps.nix b/systems/mmacbookpro/apps.nix index 89d0e5f..61eef16 100644 --- a/systems/mmacbookpro/apps.nix +++ b/systems/mmacbookpro/apps.nix @@ -43,6 +43,7 @@ "zed" "neovide" "pycharm" + "rustrover" "webstorm" "clion" "goland"