diff --git a/configuration.nix b/configuration.nix index 587a6f1..14153eb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,6 +8,7 @@ inputs.home-manager.nixosModules.default ]; + # home manager home-manager = { extraSpecialArgs = { inherit inputs; }; @@ -29,17 +30,15 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - swapDevices = [ ]; - - fileSystems."mnt/win" = { - device = "/dev/sdb1"; - fsType = "ntfs"; - }; +# fileSystems."mnt/win" = { +# device = "/dev/sdb1"; +# fsType = "ntfs"; +# }; # Flakes nix.settings.experimental-features = [ "nix-command" "flakes" ]; - networking.hostName = "nico-nixos"; # Define your hostname. + networking.hostName = "nixos"; # Define your hostname. networking.enableIPv6 = false; # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -51,11 +50,11 @@ boot.loader.efi.canTouchEfiVariables = true; networking.networkmanager.enable = true; # VM - virtualisation.virtualbox.host.enable = true; - virtualisation.virtualbox.host.enableExtensionPack = true; - virtualisation.virtualbox.host.enableKvm = true; - virtualisation.virtualbox.host.addNetworkInterface = false; - users.extraGroups.vboxusers.members = [ "nico" ]; +# virtualisation.virtualbox.host.enable = true; +# virtualisation.virtualbox.host.enableExtensionPack = true; +# virtualisation.virtualbox.host.enableKvm = true; +# virtualisation.virtualbox.host.addNetworkInterface = false; +# users.extraGroups.vboxusers.members = [ "nico" ]; # virtualisation.virtualbox.guest.enable = true; # virtualisation.virtualbox.guest.dragAndDrop = true; # virtualisation.docker.enable = true; @@ -109,23 +108,16 @@ services.mullvad-vpn.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.nico = { isNormalUser = true; description = "nico"; extraGroups = [ "networkmanager" "wheel" "adbusers" "docker"]; packages = with pkgs; [ - obsidian - musescore - mullvad-vpn ]; }; - users.defaultUserShell = pkgs.nushell; + users.defaultUserShell = pkgs.zsh; environment.shells = with pkgs; [ zsh nushell ]; programs.zsh.enable = true; - # Install firefox. - programs.firefox.enable = true; - # Allow unfree packages nixpkgs.config.allowUnfree = true; - # List packages installed in system profile. To search, run: $ nix search wget environment.systemPackages = with pkgs; [ vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed diff --git a/flake.lock b/flake.lock index efeb669..80fd674 100644 --- a/flake.lock +++ b/flake.lock @@ -40,6 +40,28 @@ "type": "github" } }, + "firefox-addons": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "dir": "pkgs/firefox-addons", + "lastModified": 1745752599, + "narHash": "sha256-vX5uq4wv7FeNeeFtsTPXQ9n2hd92NFXI+u9sg1K8OhA=", + "owner": "rycee", + "repo": "nur-expressions", + "rev": "0388c30f59e860307b2ef0ba93f38d2e525a153e", + "type": "gitlab" + }, + "original": { + "dir": "pkgs/firefox-addons", + "owner": "rycee", + "repo": "nur-expressions", + "type": "gitlab" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -111,6 +133,7 @@ "root": { "inputs": { "ags": "ags", + "firefox-addons": "firefox-addons", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "spicetify-nix": "spicetify-nix" diff --git a/flake.nix b/flake.nix index b31a32d..6a61021 100644 --- a/flake.nix +++ b/flake.nix @@ -12,12 +12,17 @@ ags.url = "github:Aylur/ags"; spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + + firefox-addons = { + url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { self, nixpkgs, ... }@inputs: let system = "x86_64-linux"; in { - nixosConfigurations.my-nixos = nixpkgs.lib.nixosSystem { + nixosConfigurations.nixos = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { inherit inputs; diff --git a/hardware-configuration.nix b/hardware-configuration.nix index 71d1247..1cf6e01 100644 --- a/hardware-configuration.nix +++ b/hardware-configuration.nix @@ -14,12 +14,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/926a710f-a999-4c59-9040-8045efaa6e28"; + { device = "/dev/disk/by-uuid/a4bfe07b-a6b5-47d9-80c7-f74b44f84f31"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/39F5-52FB"; + { device = "/dev/disk/by-uuid/CB01-5AA6"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; diff --git a/packages/default.nix b/packages/default.nix index e16c58f..644c391 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -3,6 +3,7 @@ imports = [ # ./ags ./other + # ./floorp ./sway ./swaync ./waybar diff --git a/packages/floorp/default.nix b/packages/floorp/default.nix new file mode 100644 index 0000000..ae0c9bf --- /dev/null +++ b/packages/floorp/default.nix @@ -0,0 +1,44 @@ +{ inputs, pkgs, config, lib,... }: +{ + home.packages = with pkgs; [ + + ]; + + programs.floorp = { + enable = true; + profiles.default = { + extensions.packages = with inputs.firefox-addons.packages.${pkgs.system}; [ + ublock-origin + vimium + darkreader + sidebery + bitwarden + ]; + # extensions.force.settings = { + # dark-reader = { + # + # }; + # }; + + extensions.force.settings.sidebery = { + # Beispielhafte Einstellungen für Sidebery + "showInSidebar" = true; # Stelle sicher, dass Sidebery in der Sidebar angezeigt wird + "showOtherExtensions" = false; # Verstecke andere Extensions + }; + + settings = { + + "ui.systemUsesDarkTheme" = 1; + "floorp.delete.browser.border" = true; + "floorp.chrome.theme.mode" = 2; + "floorp.browser.tabbar.settings" = 2; + "floorp.Tree-type.verticaltab.optimization" = true; + "floorp.bookmarks.bar.focus.mode" = true; + }; + }; + }; + + + + +} diff --git a/packages/hyprland/startup.conf b/packages/hyprland/startup.conf index cbe6268..f10a073 100644 --- a/packages/hyprland/startup.conf +++ b/packages/hyprland/startup.conf @@ -1,3 +1,4 @@ exec-once=waybar +exec-once=wpaperd exec-once=swaync exec-once=wl-paste --watch cliphist store diff --git a/packages/kitty/default.nix b/packages/kitty/default.nix index 421667d..fb26f96 100644 --- a/packages/kitty/default.nix +++ b/packages/kitty/default.nix @@ -49,7 +49,7 @@ programs.zsh = { shellAliases = { - update = "sudo nixos-rebuild switch --flake /etc/nixos/#my-nixos"; + update = "sudo nixos-rebuild switch"; emacs = "emacs -nw"; femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el"; pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el"; diff --git a/packages/nvim/default.nix b/packages/nvim/default.nix index 49c6055..be61613 100644 --- a/packages/nvim/default.nix +++ b/packages/nvim/default.nix @@ -50,6 +50,7 @@ programs.neovim.plugins = [ ".config/nvim/lua/plugins/tabout.lua".source = ./lua/plugins/tabout.lua; ".config/nvim/lua/plugins/autopair.lua".source = ./lua/plugins/autopair.lua; ".config/nvim/lua/plugins/mini-animate.lua".source = ./lua/plugins/mini-animate.lua; + ".config/nvim/lua/plugins/vim-suda.lua".source = ./lua/plugins/vim-suda.lua; } ]; diff --git a/packages/nvim/lua/plugins/vim-suda.lua b/packages/nvim/lua/plugins/vim-suda.lua new file mode 100644 index 0000000..ecb555b --- /dev/null +++ b/packages/nvim/lua/plugins/vim-suda.lua @@ -0,0 +1,3 @@ +return { + "lambdalisue/vim-suda" +} diff --git a/packages/wpaperd/config.toml b/packages/wpaperd/config.toml index 91e2f67..d7fe83a 100644 --- a/packages/wpaperd/config.toml +++ b/packages/wpaperd/config.toml @@ -1,4 +1,4 @@ [any] duration = "10m" mode = "center" -path = "/home/n/Documents/Wallpapers" +path = "/home/nico/Documents/Wallpapers"