From cdc170770fe05b66f3424abe2671c5b2c2af05bb Mon Sep 17 00:00:00 2001 From: Nico Date: Mon, 28 Apr 2025 23:07:58 +0200 Subject: [PATCH] rights2 --- #push.sh# | 13 --- configuration.nix~ | 251 --------------------------------------------- home-nico.nix~ | 27 ----- 3 files changed, 291 deletions(-) delete mode 100755 #push.sh# delete mode 100644 configuration.nix~ delete mode 100644 home-nico.nix~ diff --git a/#push.sh# b/#push.sh# deleted file mode 100755 index a752623..0000000 --- a/#push.sh# +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -if [ -z "$1" ] - then - echo "No commit message supplied" - exit 1 -fi - -sudo cp -r /etc/nixos/* . -cp -r ../Shells . -git add * -git commit -m "$1" -git push origin laptop diff --git a/configuration.nix~ b/configuration.nix~ deleted file mode 100644 index cd57385..0000000 --- a/configuration.nix~ +++ /dev/null @@ -1,251 +0,0 @@ -# Edit this configuration file to define what should be installed on your system. Help is available -# in the configuration.nix(5) man page and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, inputs, ... }: - -{ imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - inputs.home-manager.nixosModules.default - ]; - - # home manager - home-manager = { - extraSpecialArgs = { inherit inputs; }; - users = { - "nico" = import ./home-nico.nix; - }; - }; - - # hyprland -# programs.hyprland = { -# enable = true; -# xwayland.enable = true; -# }; - - # Bootloader. -# boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; boot.loader.grub.useOSProber = true; - -boot.supportedFilesystems = [ "zfs" ]; -boot.zfs.forceImportRoot = false; -networking.hostId = "8425e349"; - - - -# Boot loader config for configuration.nix: -boot.loader.grub.useOSProber = true; - boot.loader.grub = { - enable = true; - zfsSupport = true; - efiSupport = true; - efiInstallAsRemovable = true; - mirroredBoots = [ - { devices = [ "nodev"]; path = "/boot"; } - ]; - }; - - fileSystems."/" = - { device = "zpool/root"; - fsType = "zfs"; - }; - - fileSystems."/nix" = - { device = "zpool/nix"; - fsType = "zfs"; - }; - - fileSystems."/home" = - { device = "zpool/home"; - fsType = "zfs"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/49CB-AECA"; - fsType = "vfat"; - }; - -# fileSystems."/mnt" = -# { -# device = "/dev/disk/by-label/HDD"; -# fsType = "ext4"; -# }; - - - swapDevices = [ ]; - - # Flakes - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - - networking.hostName = "nico-nixos"; # Define your hostname. - networking.enableIPv6 = false; - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary networking.proxy.default = - # "http://user:password@proxy:port/"; networking.proxy.noProxy = - # "127.0.0.1,localhost,internal.domain"; - - # Enable networking - 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.guest.enable = true; - # virtualisation.virtualbox.guest.dragAndDrop = true; -# virtualisation.docker.enable = true; - - # Set your time zone. - time.timeZone = "Europe/Berlin"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { LC_ADDRESS = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; LC_MONETARY = "en_US.UTF-8"; LC_NAME = "en_US.UTF-8"; LC_NUMERIC = - "en_US.UTF-8"; LC_PAPER = "en_US.UTF-8"; LC_TELEPHONE = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8"; - }; - - # Enable the X11 windowing system. You can disable this if you're only using the Wayland session. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - - # Configure keymap in X11 - services.xserver = { xkb.layout = "us"; xkb.variant = ""; - }; - - # Configure console keymap - console.keyMap = "us"; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - services.pulseaudio.enable = true; - security.rtkit.enable = true; - services.pipewire = { - enable = false; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, no - # need to redefine it in your config for now) - #media-session.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.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; - 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 - wget - git - kitty - tree - nodejs - gparted - heroic - wineWowPackages.stable - spotify - sshfs - - # sway - networkmanager - networkmanagerapplet - wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout - mako # notification system developed by swaywm maintainer - waybar # bar - pulseaudio - pavucontrol - brightnessctl # brightness controls - wpaperd # wallpaper manager - ]; - -fonts.packages = with pkgs; [ -# iosevka - # (nerdfonts.override { fonts = [ "JetBrainsMono" "UbuntuMono" ]; }) - nerd-fonts.jetbrains-mono - nerd-fonts.ubuntu-mono -]; - -hardware.amdgpu.opencl.enable = true; - - programs.steam = { - enable = true; - }; - - - services.gnome.gnome-keyring.enable = true; - - programs.sway = { - enable = true; - wrapperFeatures.gtk = true; - }; - - -# programs.hyprland = { -# enable = true; -# package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; -# }; - - - # Some programs need SUID wrappers, can be configured further or are started in user sessions. - # programs.mtr.enable = true; programs.gnupg.agent = { - # enable = true; enableSSHSupport = true; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. services.openssh.enable = true; - - # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; Or disable the firewall altogether. - # networking.firewall.enable = false; - - networking.firewall = { - enable = true; - allowedTCPPortRanges = [ - { from = 1714; to = 1764; } # KDE Connect - ]; - allowedUDPPortRanges = [ - { from = 1714; to = 1764; } # KDE Connect - ]; - }; - - - # This value determines the NixOS release from which the default settings for stateful data, like - # file locations and database versions on your system were taken. It‘s perfectly fine and - # recommended to leave this value at the release version of the first install of this system. Before - # changing this value read the documentation for this option (e.g. man configuration.nix or on - # https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? - -} diff --git a/home-nico.nix~ b/home-nico.nix~ deleted file mode 100644 index 34fa1bf..0000000 --- a/home-nico.nix~ +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, inputs, ... }: - -{ - home.username = "n"; - home.homeDirectory = "/home/n"; - - imports = [ - ./packages - ]; - - nixpkgs = { - config = { - allowUnfree = true; - allowUnfreePredicate = (_: true); - }; - }; - - home.packages = with pkgs; [ - brave - go - ]; - - home.stateVersion = "24.05"; - - programs.home-manager.enable = true; - -}