diff options
| -rw-r--r-- | flake.nix | 39 | ||||
| -rw-r--r-- | home.nix | 54 | ||||
| -rw-r--r-- | machines/x220-gnome/configuration.nix | 10 | ||||
| -rw-r--r-- | machines/x220-gnome/pn.nix | 18 |
4 files changed, 68 insertions, 53 deletions
diff --git a/flake.nix b/flake.nix index a966d4d..6f92c24 100644 --- a/flake.nix +++ b/flake.nix @@ -1,23 +1,28 @@ { - description = "Nixos config flake"; + description = "Nixos config flake"; - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; - outputs = { self, nixpkgs, ... }@inputs: { - nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs;}; - modules = [ - ./machines/x220-gnome/configuration.nix - inputs.home-manager.nixosModules.default + outputs = { self, nixpkgs, ... }@inputs: { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { + specialArgs = {inherit inputs;}; + modules = [ + ./machines/x220-gnome/configuration.nix + inputs.home-manager.nixosModules.default + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.pn = import ./home.nix; + } - ]; - }; - }; + ]; + }; + }; } diff --git a/home.nix b/home.nix index 8dc1a36..1ab3a6b 100644 --- a/home.nix +++ b/home.nix @@ -17,12 +17,12 @@ let ]; in { - dconf.enable = false; + #dconf.enable = false; - programs.obs-studio = { - enable = true; - plugins = with pkgs; [ obs-wlrobs obs-v4l2sink ]; - }; + #programs.obs-studio = { + #enable = true; + #plugins = with pkgs; [ obs-wlrobs obs-v4l2sink ]; + #}; # Home Manager needs a bit of information about you and the # paths it should manage. @@ -32,39 +32,39 @@ in imports = [ # Platform specific config # ./programs/zsh - ./programs/newsboat + #./programs/newsboat ./programs/git.nix - ./programs/mpv.nix - ./programs/sent + #./programs/mpv.nix + #./programs/sent # ./programs/qutebrowser.nix ] ++ platformSetup; home.packages = with pkgs; [ # wywozik # Basic - slop - xlibs.xdpyinfo - amfora - translate-shell - nix-index - fzf + #slop + #xlibs.xdpyinfo + #amfora + #translate-shell + #nix-index + #fzf # Handy tools - skanlite - imagemagick + #skanlite + #imagemagick # Misc - weechat - todoist - browserpass - #minecraft - spotify-tui - spotifyd - # gimp - pandoc - texlive.combined.scheme-medium - zathura + #weechat + #todoist + #browserpass + ##minecraft + #spotify-tui + #spotifyd + ## gimp + #pandoc + #texlive.combined.scheme-medium + #zathura ]; # This value determines the Home Manager release that your @@ -75,5 +75,5 @@ in # You can update Home Manager without changing this value. See # the Home Manager release notes for a list of state version # changes in each release. - home.stateVersion = "20.09"; + home.stateVersion = "24.05"; } diff --git a/machines/x220-gnome/configuration.nix b/machines/x220-gnome/configuration.nix index 30cfac6..ea23c3e 100644 --- a/machines/x220-gnome/configuration.nix +++ b/machines/x220-gnome/configuration.nix @@ -7,6 +7,7 @@ ./gnome.nix ./pass.nix ./hardware-configuration.nix + ./pn.nix ]; # Enable networking @@ -30,15 +31,6 @@ LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8"; }; -# Define a user account. Don't forget to set a password with ‘passwd’. - users.users.pn = { - isNormalUser = true; - description = "Patryk Niedzwiedzinski"; - extraGroups = [ "networkmanager" "wheel" ]; - packages = with pkgs; [ - gnomeExtensions.gsconnect - ]; - }; programs.vim.defaultEditor = true; programs.nano.enable = false; diff --git a/machines/x220-gnome/pn.nix b/machines/x220-gnome/pn.nix new file mode 100644 index 0000000..add63cd --- /dev/null +++ b/machines/x220-gnome/pn.nix @@ -0,0 +1,18 @@ +{ pkgs, ... }: +{ + + + + + users.users.pn = { + isNormalUser = true; + description = "Patryk Niedzwiedzinski"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + gnomeExtensions.gsconnect + ]; + }; + + + +} |