diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..480aabb --- /dev/null +++ b/flake.lock @@ -0,0 +1,118 @@ +{ + "nodes": { + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706981411, + "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "652fda4ca6dafeb090943422c34ae9145787af37", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-23.11", + "repo": "home-manager", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1710695816, + "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "614b4613980a522ba49f0d194531beddbb7220d3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1710628718, + "narHash": "sha256-y+l3eH53UlENaYa1lmnCBHusZb1kxBEFd2/c7lDsGpw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "6dc11d9859d6a18ab0c5e5829a5b8e4810658de3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "release-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1710534455, + "narHash": "sha256-huQT4Xs0y4EeFKn2BTBVYgEwJSv8SDlm82uWgMnCMmI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9af9c1c87ed3e3ed271934cb896e0cdd33dae212", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable", + "sops-nix": "sops-nix" + } + }, + "sops-nix": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1710644594, + "narHash": "sha256-RquCuzxfy4Nr8DPbdp3D/AsbYep21JgQzG8aMH9jJ4A=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "83b68a0e8c94b72cdd0a6e547a14ca7eb1c03616", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index c7a2a92..a311f69 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ overlay-unstable ]; }) - ./hosts/mbeno + ./hosts/zedd sops-nix.nixosModules.sops ]; }; diff --git a/hosts/zedd/configuration.nix b/hosts/zedd/configuration.nix index 4d3a0c7..1356d6c 100644 --- a/hosts/zedd/configuration.nix +++ b/hosts/zedd/configuration.nix @@ -1,7 +1,4 @@ { config, pkgs, ... }: -let - unstable = import { config = { allowUnfree = true; }; }; -in { # Enable OpenGL # Load nvidia driver for Xorg and Wayland @@ -21,6 +18,22 @@ in time.timeZone = "Europe/Oslo"; i18n.defaultLocale = "en_US.UTF-8"; + environment.sessionVariables = rec { + XDG_CACHE_HOME = "$HOME/.cache"; + XDG_CONFIG_HOME = "$HOME/.config"; + XDG_DATA_HOME = "$HOME/.local/share"; + XDG_STATE_HOME = "$HOME/.local/state"; + XDG_BIN_HOME = "$HOME/.local/bin"; + PATH = [ "${XDG_BIN_HOME}" ]; + }; + xdg.portal = { + enable = true; + xdgOpenUsePortal = true; + extraPortals = (with pkgs; [ + # unstable.xdg-desktop-portal-hyprland + xdg-desktop-portal-gtk + ]); + }; # Allow unfree packages nixpkgs.config.allowUnfree = true; diff --git a/hosts/zedd/hardware-configuration.nix b/hosts/zedd/hardware-configuration.nix index f5dc983..c8ab28f 100644 --- a/hosts/zedd/hardware-configuration.nix +++ b/hosts/zedd/hardware-configuration.nix @@ -5,7 +5,8 @@ { imports = - [ (modulesPath + "/installer/scan/not-detected.nix") + [ + (modulesPath + "/installer/scan/not-detected.nix") ]; boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; @@ -14,18 +15,19 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/d05743bb-9448-483b-8002-caa0da402820"; + { + device = "/dev/disk/by-uuid/d05743bb-9448-483b-8002-caa0da402820"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/4B24-7005"; + { + device = "/dev/disk/by-uuid/4B24-7005"; fsType = "vfat"; }; swapDevices = - [ { device = "/dev/disk/by-uuid/796cc9db-33c0-446e-8be6-02ae63461c19"; } - ]; + [{ device = "/dev/disk/by-uuid/796cc9db-33c0-446e-8be6-02ae63461c19"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's diff --git a/system/programs.nix b/system/programs.nix index c6fc877..aa56db3 100644 --- a/system/programs.nix +++ b/system/programs.nix @@ -26,6 +26,15 @@ rbw nil nixpkgs-fmt + curl + git + libnotify + usbutils + vim + wget + v4l-utils + nmap + ]; systemd = { user.services.polkit-gnome-authentication-agent-1 = { diff --git a/system/security.nix b/system/security.nix index 5f0fc90..8f4af2c 100644 --- a/system/security.nix +++ b/system/security.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ config, pkgs, ... }: { # Enable sudo security.sudo = { enable = true; diff --git a/user/default.nix b/user/default.nix index 11d0e5f..a099bc2 100644 --- a/user/default.nix +++ b/user/default.nix @@ -12,7 +12,6 @@ ./programs/firefox ./programs/tmux ./programs/dunst - ./programs/kitty ./programs/rofi ./programs/obs-studio ./programs/vscode