diff --git a/configs/common.nix b/configs/common.nix index 1a3adca..e7f7822 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -77,6 +77,7 @@ in nix-tree nmap nodejs + parallel pciutils ruby tealdeer diff --git a/configs/gui.nix b/configs/gui.nix index ba2c678..54dcf17 100644 --- a/configs/gui.nix +++ b/configs/gui.nix @@ -120,10 +120,10 @@ displayManager = { lightdm = { enable = true; - background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath; + # background = pkgs.nixos-artwork.wallpapers.nineish-dark-gray.gnomeFilePath; greeters.gtk.theme = { - package = pkgs.mojave-gtk-theme; - name = "Mojave-dark"; + package = pkgs.pantheon.elementary-gtk-theme; + name = "elementary"; }; }; defaultSession = "xsession"; diff --git a/configs/secrets.nix.secret b/configs/secrets.nix.secret index 9268b2e..2decefa 100644 Binary files a/configs/secrets.nix.secret and b/configs/secrets.nix.secret differ diff --git a/configs/user-gui-applications.nix b/configs/user-gui-applications.nix index 5c2e513..60a5f00 100644 --- a/configs/user-gui-applications.nix +++ b/configs/user-gui-applications.nix @@ -42,6 +42,7 @@ in wine winetricks obs-studio + freecad ]; }; }; diff --git a/configs/user-gui.nix b/configs/user-gui.nix index e934c63..8c15347 100644 --- a/configs/user-gui.nix +++ b/configs/user-gui.nix @@ -53,15 +53,15 @@ in size = 12; }; gtk3 = { - bookmarks = [ - "file:///home/alex/Downloads" - "file:///home/alex/Nextcloud" - "file:///mnt/second" - "smb://192.168.0.100/storage/" - "file:///home/alex/Workspace" - "file:///home/alex/3D%20Print" - "file:///home/alex/Sync" - ]; + # bookmarks = [ + # "file:///home/alex/Downloads" + # "file:///home/alex/Nextcloud" + # "file:///mnt/second" + # "smb://192.168.0.100/storage/" + # "file:///home/alex/Workspace" + # "file:///home/alex/3D%20Print" + # "file:///home/alex/Sync" + # ]; extraConfig = { gtk-application-prefer-dark-theme = 1; }; @@ -314,12 +314,6 @@ in dawnTime = "06:30-07:00"; }; - screen-locker = { - enable = true; - enableDetectSleep = true; - inactiveInterval = 30; - lockCmd = "light-locker-command -l"; - }; flameshot.enable = true; }; diff --git a/configs/user.nix b/configs/user.nix index 48c3364..f9da12c 100644 --- a/configs/user.nix +++ b/configs/user.nix @@ -22,8 +22,6 @@ environment.pathsToLink = [ "/share/zsh" ]; home-manager.users.alex = { pkgs, ... }: { - - home = { enableNixpkgsReleaseCheck = false; packages = with pkgs; [ diff --git a/machine/desktop.nix b/machine/desktop.nix index 7f1c4d4..30ca2e5 100644 --- a/machine/desktop.nix +++ b/machine/desktop.nix @@ -92,16 +92,16 @@ in enable = true; config = '' INTERVAL=10 - DEVPATH=hwmon3=devices/platform/it87.656 - DEVNAME=hwmon3=it8665 - FCTEMPS=hwmon3/pwm3=hwmon3/temp1_input hwmon3/pwm2=hwmon3/temp1_input hwmon3/pwm1=hwmon3/temp1_input - FCFANS=hwmon3/pwm3=hwmon3/fan2_input hwmon3/pwm2=hwmon3/fan1_input hwmon3/pwm1= - MINTEMP=hwmon3/pwm3=60 hwmon3/pwm2=60 hwmon3/pwm1=60 - MAXTEMP=hwmon3/pwm3=75 hwmon3/pwm2=75 hwmon3/pwm1=75 - MINSTART=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51 - MINSTOP=hwmon3/pwm3=51 hwmon3/pwm2=51 hwmon3/pwm1=51 - MINPWM=hwmon3/pwm1=51 hwmon3/pwm2=51 hwmon3/pwm3=51 - MAXPWM=hwmon3/pwm3=127 hwmon3/pwm2=204 + DEVPATH=hwmon2=devices/platform/it87.656 + DEVNAME=hwmon2=it8665 + FCTEMPS=hwmon2/pwm3=hwmon2/temp1_input hwmon2/pwm2=hwmon2/temp1_input hwmon2/pwm1=hwmon2/temp1_input + FCFANS=hwmon2/pwm3=hwmon2/fan2_input hwmon2/pwm2=hwmon2/fan1_input hwmon2/pwm1= + MINTEMP=hwmon2/pwm3=60 hwmon2/pwm2=60 hwmon2/pwm1=60 + MAXTEMP=hwmon2/pwm3=75 hwmon2/pwm2=75 hwmon2/pwm1=75 + MINSTART=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 + MINSTOP=hwmon2/pwm3=51 hwmon2/pwm2=51 hwmon2/pwm1=51 + MINPWM=hwmon2/pwm1=51 hwmon2/pwm2=51 hwmon2/pwm3=51 + MAXPWM=hwmon2/pwm3=127 hwmon2/pwm2=204 ''; }; diff --git a/packages/idasen.nix b/packages/idasen.nix new file mode 100644 index 0000000..4fa0804 --- /dev/null +++ b/packages/idasen.nix @@ -0,0 +1,27 @@ +with import {}; + +( let + idasen = pkgs.python3Packages.buildPythonPackage rec { + name = "idasen"; + version = "v0.7.1"; + + src = pkgs.fetchFromGitHub { + owner = "newAM"; + repo = "${name}"; + rev = "${version}"; + #sha256 = "1ibrwal80z27c2mh9hx85idmzilx6cpcmgc15z3lyz57bz0krigb"; + }; + + meta = { + homepage = "https://github.com/newAM/idasen"; + description = "This is a command line interface written in python to control the Idasen via bluetooth from a desktop computer."; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with maintainers; [ newAM ]; + }; + }; + + in pkgs.python3.buildEnv.override rec { + extraLibs = with pkgs.python3Packages; [ numpy toolz vpn-slice ]; + propagatedBuildInputs = with pkgs.python3Packages; [ setproctitle ]; + } +).env