diff --git a/flake.nix b/flake.nix index 1a6cb62..c28ee06 100644 --- a/flake.nix +++ b/flake.nix @@ -10,8 +10,10 @@ ./modules ./home-modules ]; + flake = { }; + perSystem = {pkgs, ...}: { devShells.default = pkgs.mkShell { packages = with pkgs; [ diff --git a/home/default.nix b/home/default.nix index 23225df..383b5de 100644 --- a/home/default.nix +++ b/home/default.nix @@ -8,10 +8,5 @@ extraOutputsToInstall = ["doc" "devdoc"]; }; - nixpkgs.config = { - allowUnfree = true; - allowUnfreePredicate = _: true; - }; - programs.home-manager.enable = true; } diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index 54a1fe8..919c4ea 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -12,14 +12,14 @@ ../../secrets # ../../terminal - ../../terminal/programs/zellij.nix + # ../../terminal/programs/zellij.nix ../../terminal/programs/zoxide.nix # ../../terminal/programs/irssi.nix ../../terminal/programs/lazygit.nix - ../../terminal/programs/beets.nix + # ../../terminal/programs/beets.nix ../../editors/emacs.nix ../../editors/vscode.nix - ../../editors/jetbrains + # ../../editors/jetbrains ../../programs/browsers/firefox ../../programs/browsers/tor.nix ../../programs/browsers/chromium.nix @@ -44,13 +44,13 @@ ../../programs/misc/krita.nix #../../programs/misc/ardour.nix ../../programs/misc/foliate.nix - ../../programs/misc/obsidian.nix + # ../../programs/misc/obsidian.nix ../../programs/misc/pwvucontrol.nix ../../programs/misc/qpwgraph.nix - ../../programs/misc/thunderbird.nix + # ../../programs/misc/thunderbird.nix #../../programs/music #../../programs/music/yams.nix - ../../programs/music/spotify.nix + # ../../programs/music/spotify.nix ../../programs/media ../../programs/media/jellyfin.nix # gaming @@ -100,6 +100,6 @@ umu = enabled; roblox.sobercookie = enabled; }; - school.geogebra = enabled; + # school.geogebra = enabled; }; } diff --git a/home/programs/misc/discord.nix b/home/programs/misc/discord.nix index ee95bf8..ff88db2 100644 --- a/home/programs/misc/discord.nix +++ b/home/programs/misc/discord.nix @@ -1,9 +1,9 @@ {pkgs, ...}: { home.packages = with pkgs; [ vesktop - (discord.override { - withOpenASAR = true; - }) + # (discord.override { + # withOpenASAR = true; + # }) ]; # services.arrpc.enable = true; # RPC with vesktop (disabled since it uses way more cpu than is reasonable for such a program) } diff --git a/hosts/default.nix b/hosts/default.nix index 1538edf..5281485 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -23,17 +23,6 @@ in { meta = { nixpkgs = import inputs.nixpkgs { system = "x86_64-linux"; - config.allowUnfree = true; - }; - - nodeNixpkgs = { - nixdesk = import inputs.nixpkgs { - system = "x86_64-linux"; - config = { - allowUnfree = true; - rocmSupport = true; - }; - }; }; inherit specialArgs; @@ -115,7 +104,7 @@ in { services.syncthing services.virt.waydroid - #services.virt.virt-manager + services.virt.virt-manager #network.wifi #services.ollama desktop.x11.nosleep diff --git a/hosts/nixdesk/default.nix b/hosts/nixdesk/default.nix index 743eb2d..3a85001 100644 --- a/hosts/nixdesk/default.nix +++ b/hosts/nixdesk/default.nix @@ -19,6 +19,16 @@ # "resume_offset=3841492992" # fdisk -l #]; + nixpkgs.config = { + rocmSupport = true; + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-original" + "apple_cursor" # bwuh this is NOT unfree!! + ]; + }; + networking.interfaces.eno1.wakeOnLan.enable = true; system.stateVersion = "23.11"; diff --git a/hosts/nixdesk/hardware.nix b/hosts/nixdesk/hardware.nix index 2ef385e..7115c70 100644 --- a/hosts/nixdesk/hardware.nix +++ b/hosts/nixdesk/hardware.nix @@ -79,7 +79,7 @@ device = "/.swapvol/swapfile"; }; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; services.xserver.videoDrivers = [ "amdgpu" diff --git a/pkgs/ida-pro/default.nix b/pkgs/ida-pro/default.nix index d1ac4c4..08b3f86 100644 --- a/pkgs/ida-pro/default.nix +++ b/pkgs/ida-pro/default.nix @@ -164,7 +164,7 @@ in description = "Paid version of the world's smartest and most feature-full disassembler"; homepage = "https://hex-rays.com/ida-free/"; changelog = "https://hex-rays.com/products/ida/news/"; - # license = licenses.unfree; + # license = licenses.unfree; # unfree packages are a pain to deal with on nixos mainProgram = "ida64"; # maintainers = with maintainers; [msanft]; platforms = ["x86_64-linux"]; # Right now, the installation script only supports Linux. diff --git a/profiles/nix/default.nix b/profiles/nix/default.nix index 5874f81..03817a3 100644 --- a/profiles/nix/default.nix +++ b/profiles/nix/default.nix @@ -10,7 +10,6 @@ ... }: { imports = [ - super.nixpkgs super.substituters ]; diff --git a/profiles/nix/nixpkgs.nix b/profiles/nix/nixpkgs.nix deleted file mode 100644 index d554375..0000000 --- a/profiles/nix/nixpkgs.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ - self, - super, - root, -}: { - nixpkgs = { - config.allowUnfree = true; - config.permittedInsecurePackages = []; - }; -} diff --git a/profiles/programs/tools.nix b/profiles/programs/tools.nix index d478e9e..818cfcf 100644 --- a/profiles/programs/tools.nix +++ b/profiles/programs/tools.nix @@ -17,11 +17,7 @@ lm_sensors fd # find replacement graphviz-nox - ( - if config.nixpkgs.config.allowUnfree - then p7zip-rar - else p7zip - ) + p7zip unar openssl # for generating passwords ]; diff --git a/profiles/services/virt/virt-manager.nix b/profiles/services/virt/virt-manager.nix index 06cf57a..3545edf 100644 --- a/profiles/services/virt/virt-manager.nix +++ b/profiles/services/virt/virt-manager.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +_: {pkgs, ...}: { virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; boot.kernelParams = ["amd_iommu=on" "iommu=pt"];