Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

current working state trying to get plasma6 working

Browse source
This commit is contained in:
LordGrimmauld 2024-02-29 10:23:21 +01:00
parent 55fe322c09
commit 2b4dfd663b
8 changed files with 89 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

180
flake.lock
View file

@ -44,22 +44,6 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -93,46 +77,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"plasma6",
"pre-commit-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1703887061,
"narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -160,11 +104,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1707614138, "lastModified": 1709168939,
"narHash": "sha256-xdmNhDnlDF5H/yT1wLGqwVyphjj03lmA/e3SGXyC3DU=", "narHash": "sha256-btWt7NRsA8Hysgin5su77nIdmZZbxsKW5qqyj/bBlF0=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "a5de885438ecce695b4b7a110974c33f0eb507e3", "rev": "22586cc4910284c9c7306f19dcd63ac0adbcbcc9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -207,29 +151,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-stable": {
"locked": {
"lastModified": 1704874635,
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1707451808, "lastModified": 1708751719,
"narHash": "sha256-UwDBUNHNRsYKFJzyTMVMTF5qS4xeJlWoeyJf+6vvamU=", "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "442d407992384ed9c0e6d352de75b69079904e4e", "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,106 +169,41 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1707934190, "lastModified": 1709150264,
"narHash": "sha256-pheFtJ6eB80oGeehOU8lXkxr6dXWmlggS0sNt/ZOFWs=", "narHash": "sha256-HofykKuisObPUfj0E9CJVfaMhawXkYx3G8UIFR/XQ38=",
"ref": "nixos-unstable",
"rev": "fd93f45f542133d046ddeaeba13860d2e4a3eef2",
"revCount": 583448,
"type": "git",
"url": "file:///home/grimmauld/nixpkgs"
},
"original": {
"ref": "nixos-unstable",
"type": "git",
"url": "file:///home/grimmauld/nixpkgs"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1706812040,
"narHash": "sha256-pxgWZApBfqHi4I6Hz7nL/rSt0vGE62HvBwvuVXFXeOk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5c5bca5a97c0982ea37a2fcf6d3860349b9f9a35", "rev": "9099616b93301d5cf84274b184a3a5ec69e94e08",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable-small", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"plasma6": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_4",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1707218112,
"narHash": "sha256-GXwhrTyeIj38aBi8t6fxasuJ3h2AhvxDypAxQjKrrTY=",
"owner": "nix-community",
"repo": "kde2nix",
"rev": "285ae35495f7a39aacf91598ecf154035bc5d2e8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "kde2nix",
"type": "github"
}
},
"pre-commit-hooks": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": [
"plasma6",
"flake-utils"
],
"gitignore": "gitignore",
"nixpkgs": [
"plasma6",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1706424699,
"narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"nix-gaming": "nix-gaming", "nix-gaming": "nix-gaming",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"plasma6": "plasma6",
"swayfx": "swayfx" "swayfx": "swayfx"
} }
}, },
"swayfx": { "swayfx": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1704454987, "lastModified": 1707986911,
"narHash": "sha256-vGc23vf8C1WIdaUgEs3XqvCU1ag5soQKZnytUsCRpEw=", "narHash": "sha256-kRWXQnUkMm5HjlDX9rBq8lowygvbK9+ScAOhiySR3KY=",
"owner": "WillPower3309", "owner": "WillPower3309",
"repo": "swayfx", "repo": "swayfx",
"rev": "f0ecffe593574593ec99c104fa12e4bfd593b0f2", "rev": "2bd366f3372d6f94f6633e62b7f7b06fcf316943",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,21 +226,6 @@
"repo": "default", "repo": "default",
"type": "github" "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"
}
} }
}, },
"root": "root", "root": "root",

9
flake.nix
View file

@ -3,18 +3,17 @@
inputs = { inputs = {
nixpkgs = { nixpkgs = {
url = "git+file:///home/grimmauld/nixpkgs?ref=nixos-unstable"; url = "github:NixOS/nixpkgs/nixos-unstable"; # git+file:///home/grimmauld/nixpkgs?ref=nixos-unstable";
}; };
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
swayfx = { swayfx = {
url = "github:WillPower3309/swayfx"; url = "github:WillPower3309/swayfx";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
plasma6.url = "github:nix-community/kde2nix";
nix-gaming.url = "github:fufexan/nix-gaming"; nix-gaming.url = "github:fufexan/nix-gaming";
}; };
outputs = inputs @ { self, agenix, nix-gaming, nixpkgs, plasma6, swayfx, ... }: let outputs = inputs @ { self, agenix, nix-gaming, nixpkgs, swayfx, ... }: let
system = "x86_64-linux"; system = "x86_64-linux";
# pkg-overlays = import nixpkgs { # pkg-overlays = import nixpkgs {
@ -31,13 +30,13 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
# ({ config, pkgs, ... }: { nixpkgs.overlays = [ (import ./overlay.nix {inherit inputs system;} ) ]; }) # ({ config, pkgs, ... }: { nixpkgs.overlays = [ (import ./overlay.nix {inherit inputs system;} ) ]; })
plasma6.nixosModules.default
agenix.nixosModules.default agenix.nixosModules.default
nix-gaming.nixosModules.pipewireLowLatency nix-gaming.nixosModules.pipewireLowLatency
# ./kernel.nix # ./kernel.nix
./configuration.nix ./configuration.nix
# ./modules/accessibility.nix # ./modules/accessibility.nix
./modules/sway.nix ./modules/sway.nix
# ./modules/sunshine.nix
./modules/localisation.nix ./modules/localisation.nix
./modules/users.nix ./modules/users.nix
./modules/tlp.nix ./modules/tlp.nix
@ -54,7 +53,7 @@
./modules/opengl.nix ./modules/opengl.nix
./modules/kvm.nix ./modules/kvm.nix
./modules/toolchains.nix ./modules/toolchains.nix
./cachix.nix # ./cachix.nix
{ environment.systemPackages = [ agenix.packages.${system}.default ]; } { environment.systemPackages = [ agenix.packages.${system}.default ]; }
]; ];
}; };

2
modules/nvidia.nix
View file

@ -24,7 +24,7 @@ hardware.nvidia = {
nvidiaSettings = true; nvidiaSettings = true;
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.beta;
}; };
hardware.nvidia.prime = { hardware.nvidia.prime = {

18
modules/sunshine.nix Normal file
View file

@ -0,0 +1,18 @@
{pkgs, lib, config, ...} : {
environment.systemPackages = with pkgs; [
sunshine
];
security.wrappers = {
sunshine = {
owner = "root";
group = "root";
capabilities = "cap_sys_admin+p";
source = "${pkgs.sunshine}/bin/sunshine";
};
};
services.udev.packages = with pkgs; [
(writeTextDir "lib/udev/rules.d/85-sunshine.rules" ''KERNEL=="uinput", SUBSYSTEM=="misc", OPTIONS+="static_node=uinput", TAG+="uaccess"'')
];
}

14
modules/system-packages.nix
View file

@ -6,10 +6,7 @@
virtualisation.spiceUSBRedirection.enable = true; virtualisation.spiceUSBRedirection.enable = true;
# security.wrappers.spice-client-glib-usb-acl-helper.source = "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper"; # security.wrappers.spice-client-glib-usb-acl-helper.source = "${pkgs.spice_gtk}/bin/spice-client-glib-usb-acl-helper";
programs.droidcam.enable = true; programs.droidcam.enable = true;
environment.systemPackages = [ environment.systemPackages = with pkgs; [
pkgs.pkgsCross.aarch64-multiplatform.ubootQemuAarch64
# pkgs.pkgsCross.aarch64-multiplatform.OVMF.fd # AAVMF
] ++ (with pkgs; [
spice-gtk spice-gtk
wget wget
tree tree
@ -38,11 +35,8 @@
scipy scipy
])) ]))
libsForQt5.audiocd-kio # libsForQt5.
# libsForQt5.libkcompactdisc kdePackages.audiocd-kio
# libsForQt5.kio-extras
# libsForQt5.phonon
# libsForQt5.qt5.qtmultimedia
(writeShellScriptBin "primerun" '' (writeShellScriptBin "primerun" ''
export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD=1
@ -55,5 +49,5 @@ exec "$@"
(writeShellScriptBin "rebuild" '' (writeShellScriptBin "rebuild" ''
pkexec nixos-rebuild switch --flake /home/grimmauld/grimm-nixos-laptop pkexec nixos-rebuild switch --flake /home/grimmauld/grimm-nixos-laptop
'') '')
]); ];
} }

45
modules/toolchains.nix
View file

@ -6,6 +6,16 @@ in {
(writeShellScriptBin "systemd-owner" "systemctl show -pUser,UID $@") (writeShellScriptBin "systemd-owner" "systemctl show -pUser,UID $@")
(writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@") (writeShellScriptBin "nix-referrers" "nix-store --query --referrers $@")
mkpasswd mkpasswd
cargo
gcc
rustc
rustfmt
rust-analyzer
jdk17
python3
pkg-config
imgui
# nodejs_21 # ugh.... somehow nvim needs node now?!?
]; ];
programs.git = { programs.git = {
@ -39,10 +49,41 @@ in {
set hidden set hidden
set fileencodings=utf-8 set fileencodings=utf-8
set nocompatible set nocompatible
''; set clipboard+=unnamedplus
if filereadable($HOME . "/.vimrc")
source ~/.vimrc
endif
'';
packages.myVimPackage = with pkgs.vimPlugins; { packages.myVimPackage = with pkgs.vimPlugins; {
# loaded on launch # loaded on launch
start = [ vim-nix vim-scala fugitive autoclose-nvim ]; start = [
vim-nix
vim-scala
fugitive
nvim-lspconfig
# autoclose-nvim
# coc-nvim
# mason-nvim
# mason-lspconfig-nvim
# coc-rust-analyzer
rust-tools-nvim
vim-vsnip
cmp-path
cmp-nvim-lsp-signature-help
cmp-nvim-lua
cmp-buffer
cmp-vsnip
nvim-dap
nvim-treesitter-parsers.rust
nvim-treesitter-parsers.lua
nvim-treesitter-parsers.toml
nvim-treesitter-parsers.c
nvim-treesitter-parsers.vimdoc
nvim-treesitter
vimspector
snippets-nvim
];
# manually loadable by calling `:packadd $plugin-name` # manually loadable by calling `:packadd $plugin-name`
opt = [ ]; opt = [ ];
}; };

7
modules/users.nix
View file

@ -15,19 +15,20 @@
element-desktop element-desktop
nmap nmap
ghidra ghidra
firefox-esr firefox
kcalc kcalc
rmview rmview
krita krita
kicad
spicetify-cli spicetify-cli
prusa-slicer prusa-slicer
freecad freecad
openscad openscad
blender # blender
gomuks gomuks
fbcat fbcat
wootility wootility
(callPackage ./theseus-modrinth.nix {}) # (callPackage ./theseus-modrinth.nix {})
# osu-lazer-bin # osu-lazer-bin
(pkgs.symlinkJoin { (pkgs.symlinkJoin {
name = "osu"; name = "osu";

2
modules/xserver.nix
View file

@ -8,7 +8,7 @@
defaultSession = "plasma"; defaultSession = "plasma";
}; };
desktopManager = { desktopManager = {
plasma5.enable = true; plasma6.enable = true;
# xfce.enable = true; # xfce.enable = true;
}; };
}; };