diff --git a/alex/home.nix b/alex/home.nix index d576311..5a47f3c 100644 --- a/alex/home.nix +++ b/alex/home.nix @@ -6,23 +6,27 @@ home.username = "alex"; home.homeDirectory = "/home/alex"; - # Aliases - home.shellAliases = { - "git-override" = "git add . && git commit --amend --no-edit && git push --force-with-lease"; - }; - # Packages that should be installed to the user profile. home.packages = with pkgs; [ + blender discord + etcher firefox + flameshot + gimp-with-plugins gnucash + grafx2 + jellyfin-media-player keepassxc + krita + libreoffice lutris mpv nextcloud-client nixpkgs-fmt spotify steam + ventoy winetricks wineWowPackages.unstableFull yt-dlp @@ -40,6 +44,11 @@ # User software configurations programs = { + bash = { + shellAliases = { + "git-override" = "git add . && git commit --amend --no-edit && git push --force-with-lease"; + }; + }; git = { enable = true; userEmail = "alexmat2on@protonmail.com"; @@ -53,7 +62,7 @@ enable = true; extraConfig = '' background_tint 0.2 - background_image /home/alex/Downloads/artificialos/aos1.png + background_image ${pkgs.atau-wallpapers}/share/backgrounds/atau-wallpapers/aos1.png background_image_layout centered modify_font cell_width 110% @@ -62,7 +71,7 @@ window_margin_width 10 window_padding_width 2 ''; - theme = "Adventure Time"; + theme = "Rosé Pine Dawn"; font.package = pkgs.victor-mono; font.name = "Victor Mono"; font.size = 12; diff --git a/flake.lock b/flake.lock index b8e2480..1695724 100644 --- a/flake.lock +++ b/flake.lock @@ -7,17 +7,17 @@ ] }, "locked": { - "lastModified": 1687128134, - "narHash": "sha256-6O3MUIm5dJMRUw4VxYQFtTvnvemzS59HMyulZ5TEqCg=", + "lastModified": 1687541340, + "narHash": "sha256-l1Va3mygpLmtV0CeaHGETvb0y5SwWD3kM4dBu5IX9Jw=", "ref": "main", - "rev": "b8db8ac34275a625ac6f6f51ad435227526d54f0", - "revCount": 4, + "rev": "1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b", + "revCount": 10, "type": "git", "url": "https://git.atauno.com/atau/atau-nixpkgs" }, "original": { "ref": "main", - "rev": "b8db8ac34275a625ac6f6f51ad435227526d54f0", + "rev": "1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b", "type": "git", "url": "https://git.atauno.com/atau/atau-nixpkgs" } diff --git a/flake.nix b/flake.nix index f9873c8..ac225c4 100644 --- a/flake.nix +++ b/flake.nix @@ -4,21 +4,20 @@ inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; - atau-nixpkgs.url = "git+https://git.atauno.com/atau/atau-nixpkgs?ref=main&rev=b8db8ac34275a625ac6f6f51ad435227526d54f0"; + atau-nixpkgs.url = "git+https://git.atauno.com/atau/atau-nixpkgs?ref=main&rev=1e72f4b1e9b7a2991e3ccdebbe75d312f016da3b"; atau-nixpkgs.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager/release-23.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = inputs@{ nixpkgs, atau-nixpkgs, home-manager, ... }: + outputs = inputs@{ self, nixpkgs, atau-nixpkgs, home-manager, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; config.allowUnfree = true; - # note: atau-nixpkgs currently only provides the `theme-platinum9` package which is broken due to gtk2 being unsupported in newer xfce - overlays = [ atau-nixpkgs.overlay ]; + overlays = [ atau-nixpkgs.overlays.default ]; }; in { diff --git a/system/configuration.nix b/system/configuration.nix index 97fab74..aecda4d 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -14,6 +14,10 @@ nix.settings.experimental-features = [ "nix-command" "flakes" ]; nixpkgs.config.allowUnfree = true; + nixpkgs.config.permittedInsecurePackages = [ + "electron-12.2.3" + ]; + hardware.system76.enableAll = true; # Use the systemd-boot EFI boot loader. @@ -86,9 +90,6 @@ # services.xserver.layout = "us"; # services.xserver.xkbOptions = "eurosign:e,caps:escape"; - # Enable CUPS to print documents. - # services.printing.enable = true; - # Enable blueooth hardware.bluetooth.enable = true; @@ -147,6 +148,7 @@ # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + atau-wallpapers blueman dxvk font-manager @@ -154,7 +156,7 @@ mesa_22_3 pavucontrol unzip - vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + vim vulkan-extension-layer wget ];